From 380ef0dc36999fe03a96393a1133e344a894d7ec Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Tue, 10 Jul 2007 15:45:44 +0100 Subject: [PATCH] Simplify vmx host state setup code. Signed-off-by: Xin Li --- xen/arch/x86/hvm/vmx/vmcs.c | 58 ++++++++++--------------------------- xen/include/asm-x86/desc.h | 5 ---- 2 files changed, 16 insertions(+), 47 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index e9bf41f3ab..0636502185 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -247,55 +247,27 @@ void vmx_free_host_vmcs(struct vmcs_struct *vmcs) vmx_free_vmcs(vmcs); } -#define GUEST_SEGMENT_LIMIT 0xffffffff - -struct host_execution_env { - /* selectors */ - unsigned short ldtr_selector; - unsigned short tr_selector; - unsigned short ds_selector; - unsigned short cs_selector; - /* limits */ - unsigned short gdtr_limit; - unsigned short ldtr_limit; - unsigned short idtr_limit; - unsigned short tr_limit; - /* base */ - unsigned long gdtr_base; - unsigned long ldtr_base; - unsigned long idtr_base; - unsigned long tr_base; - unsigned long ds_base; - unsigned long cs_base; -#ifdef __x86_64__ - unsigned long fs_base; - unsigned long gs_base; -#endif +struct xgt_desc { + unsigned short size; + unsigned long address __attribute__((packed)); }; static void vmx_set_host_env(struct vcpu *v) { unsigned int tr, cpu; - struct host_execution_env host_env; - struct Xgt_desc_struct desc; + struct xgt_desc desc; cpu = smp_processor_id(); - __asm__ __volatile__ ("sidt (%0) \n" :: "a"(&desc) : "memory"); - host_env.idtr_limit = desc.size; - host_env.idtr_base = desc.address; - __vmwrite(HOST_IDTR_BASE, host_env.idtr_base); - - __asm__ __volatile__ ("sgdt (%0) \n" :: "a"(&desc) : "memory"); - host_env.gdtr_limit = desc.size; - host_env.gdtr_base = desc.address; - __vmwrite(HOST_GDTR_BASE, host_env.gdtr_base); - - __asm__ __volatile__ ("str (%0) \n" :: "a"(&tr) : "memory"); - host_env.tr_selector = tr; - host_env.tr_limit = sizeof(struct tss_struct); - host_env.tr_base = (unsigned long) &init_tss[cpu]; - __vmwrite(HOST_TR_SELECTOR, host_env.tr_selector); - __vmwrite(HOST_TR_BASE, host_env.tr_base); + + __asm__ __volatile__ ( "sidt (%0) \n" : : "a" (&desc) : "memory" ); + __vmwrite(HOST_IDTR_BASE, desc.address); + + __asm__ __volatile__ ( "sgdt (%0) \n" : : "a" (&desc) : "memory" ); + __vmwrite(HOST_GDTR_BASE, desc.address); + + __asm__ __volatile__ ( "str (%0) \n" : : "a" (&tr) : "memory" ); + __vmwrite(HOST_TR_SELECTOR, tr); + __vmwrite(HOST_TR_BASE, (unsigned long)&init_tss[cpu]); /* * Skip end of cpu_user_regs when entering the hypervisor because the @@ -306,6 +278,8 @@ static void vmx_set_host_env(struct vcpu *v) (unsigned long)&get_cpu_info()->guest_cpu_user_regs.error_code); } +#define GUEST_SEGMENT_LIMIT 0xffffffff + static void construct_vmcs(struct vcpu *v) { unsigned long cr0, cr4; diff --git a/xen/include/asm-x86/desc.h b/xen/include/asm-x86/desc.h index aa354aac38..8817286f60 100644 --- a/xen/include/asm-x86/desc.h +++ b/xen/include/asm-x86/desc.h @@ -203,11 +203,6 @@ extern struct desc_struct compat_gdt_table[]; # define compat_gdt_table gdt_table #endif -struct Xgt_desc_struct { - unsigned short size; - unsigned long address __attribute__((packed)); -}; - extern void set_intr_gate(unsigned int irq, void * addr); extern void set_system_gate(unsigned int n, void *addr); extern void set_task_gate(unsigned int n, unsigned int sel); -- 2.30.2